From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 26 Sep 2008 13:55:42 +0000 (+0000)
Subject: Don't use filecache if $parserOutput->containsOldMagic() either
X-Git-Tag: 1.31.0-rc.0~45082
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=db7f17159336dfea5afac5aab0eaa7434267ba47;p=lhc%2Fweb%2Fwiklou.git

Don't use filecache if $parserOutput->containsOldMagic() either
---

diff --git a/includes/Article.php b/includes/Article.php
index fd063ecc90..28a83b71e2 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3479,7 +3479,9 @@ class Article {
 			$parserCache->save( $parserOutput, $this, $wgUser );
 		}
 		// Make sure file cache is not used on uncacheable content.
-		if( $wgUseFileCache && $parserOutput->getCacheTime() == -1 ) {
+		// Output that has magic words in it can still use the parser cache
+		// (if enabled), though it will generally expire sooner.
+		if( $parserOutput->getCacheTime() == -1 || $parserOutput->containsOldMagic() ) {
 			$wgUseFileCache = false;
 		}